Synchronize with SHM branch #11
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Luca Cominardi <[email protected]>
Signed-off-by: Luca Cominardi <[email protected]>
Signed-off-by: Luca Cominardi <[email protected]>
chore: checkout dev/1.0.0
Conflicts: rmw_zenoh_cpp/src/detail/rmw_data_types.cpp rmw_zenoh_cpp/src/rmw_init.cpp rmw_zenoh_cpp/src/rmw_zenoh.cpp
yellowhatter
force-pushed
the
dev/1.0.0-shm
branch
from
dd4ea5c to
57fb755
Compare
- refine build system
- update default configs to have SHM enabled by default (if compiled with SHM support)
Signed-off-by: ChenYing Kuo <[email protected]>
Conflicts: zenoh_c_vendor/CMakeLists.txt
yellowhatter
force-pushed
the
dev/1.0.0-shm
branch
from
e1f79c6 to
381b022
Compare
Signed-off-by: ChenYing Kuo <[email protected]>
4 tasks
Conflicts: zenoh_c_vendor/CMakeLists.txt
Conflicts: .gitignore rmw_zenoh_cpp/src/detail/rmw_data_types.hpp rmw_zenoh_cpp/src/rmw_init.cpp rmw_zenoh_cpp/src/rmw_zenoh.cpp zenoh_c_vendor/CMakeLists.txt
Conflicts: rmw_zenoh_cpp/src/detail/rmw_data_types.hpp rmw_zenoh_cpp/src/rmw_init.cpp rmw_zenoh_cpp/src/rmw_zenoh.cpp
Conflicts: rmw_zenoh_cpp/src/detail/rmw_data_types.hpp rmw_zenoh_cpp/src/rmw_init.cpp rmw_zenoh_cpp/src/rmw_zenoh.cpp
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.